From 50f92465e730050469474cda86f2a07a23340864 Mon Sep 17 00:00:00 2001 From: Robert Lipe Date: Wed, 16 Mar 2022 22:44:20 -0500 Subject: [PATCH] Kill ggv_bin, ggv_ovl more dead. --- CMakeLists.txt | 3 - GPSBabel.pro | 3 - ggv_bin.cc => deprecated/ggv_bin.cc | 0 ggv_bin.h => deprecated/ggv_bin.h | 0 ggv_ovl.cc => deprecated/ggv_ovl.cc | 0 reference/ggv_bin-sample-v2.gpx | 25 --- reference/ggv_bin-sample-v2.ovl | Bin 2593 -> 0 bytes reference/ggv_bin-sample-v3.gpx | 45 ----- reference/ggv_bin-sample-v3.ovl | Bin 4148 -> 0 bytes reference/ggv_ovl.ovl | 261 ---------------------------- reference/ggv_ovl~ovl.gpx | 174 ------------------- testo.d/ggv_bin.test | 8 - testo.d/ggv_ovl.test | 7 - vecs.cc | 4 - xmldoc/formats/ggv_bin.xml | 22 --- xmldoc/formats/ggv_ovl.xml | 36 ---- 16 files changed, 588 deletions(-) rename ggv_bin.cc => deprecated/ggv_bin.cc (100%) rename ggv_bin.h => deprecated/ggv_bin.h (100%) rename ggv_ovl.cc => deprecated/ggv_ovl.cc (100%) delete mode 100644 reference/ggv_bin-sample-v2.gpx delete mode 100644 reference/ggv_bin-sample-v2.ovl delete mode 100644 reference/ggv_bin-sample-v3.gpx delete mode 100644 reference/ggv_bin-sample-v3.ovl delete mode 100644 reference/ggv_ovl.ovl delete mode 100644 reference/ggv_ovl~ovl.gpx delete mode 100644 testo.d/ggv_bin.test delete mode 100644 testo.d/ggv_ovl.test delete mode 100644 xmldoc/formats/ggv_bin.xml delete mode 100644 xmldoc/formats/ggv_ovl.xml diff --git a/CMakeLists.txt b/CMakeLists.txt index 0dd9ac25e..b7b1081cd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -98,8 +98,6 @@ set(ALL_FMTS ${MINIMAL_FMTS} garmin_xt.cc gdb.cc geojson.cc - ggv_bin.cc - ggv_ovl.cc globalsat_sport.cc gpssim.cc gtm.cc @@ -256,7 +254,6 @@ set(HEADERS gbser_private.h gdb.h geojson.h - ggv_bin.h globalsat_sport.h gpx.h grtcirc.h diff --git a/GPSBabel.pro b/GPSBabel.pro index a8b50b881..fb0adfd72 100644 --- a/GPSBabel.pro +++ b/GPSBabel.pro @@ -73,8 +73,6 @@ ALL_FMTS = $$MINIMAL_FMTS \ garmin_xt.cc \ gdb.cc \ geojson.cc \ - ggv_bin.cc \ - ggv_ovl.cc \ globalsat_sport.cc \ gpssim.cc \ gtm.cc \ @@ -229,7 +227,6 @@ HEADERS = \ gbser_private.h \ gdb.h \ geojson.h \ - ggv_bin.h \ globalsat_sport.h \ gpx.h \ grtcirc.h \ diff --git a/ggv_bin.cc b/deprecated/ggv_bin.cc similarity index 100% rename from ggv_bin.cc rename to deprecated/ggv_bin.cc diff --git a/ggv_bin.h b/deprecated/ggv_bin.h similarity index 100% rename from ggv_bin.h rename to deprecated/ggv_bin.h diff --git a/ggv_ovl.cc b/deprecated/ggv_ovl.cc similarity index 100% rename from ggv_ovl.cc rename to deprecated/ggv_ovl.cc diff --git a/reference/ggv_bin-sample-v2.gpx b/reference/ggv_bin-sample-v2.gpx deleted file mode 100644 index f4e889c7a..000000000 --- a/reference/ggv_bin-sample-v2.gpx +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/reference/ggv_bin-sample-v2.ovl b/reference/ggv_bin-sample-v2.ovl deleted file mode 100644 index 04f98fe406435d08a698654c05f6410d9f7502f7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2593 zcmZ?q_jM0*4sucOFUv{G%t=)UGtx7#Vwk|d#K6c9l3$>w;GI}hlB!^6Won>jU|^u& zlvtTsl&2f~Cxw9lh`_j7^_9A#vzmj=hXj##${r5+Ld^$GIjT9NCLZbCtM1|OAE?fX zfemOPE0D#&aEs+R6PQ5)!3xyP$RNnT!@|H2mReMtnV+X%tY<)i3ByOJt5uATzq4bA zr@voJh<^YuW?URYhL86~eL`di_&a&II)}vjcm|Km*k54704x)@fRF)LUNJGCmph|n z1|lJimKlh!7|E=WUS_m$pq3doPKH)n0oyKCx7Ka}wOv@i?F>*`gNcEIL4cvpN6_Mq zgPOyEYpT=cDS0@|$ZvXj5ZJbv{LxBy4v_z+__JV(lbVCbf1W}RpX1DlE+wFOv+r+O zxCqGqU=`knf;AMOz%GeqY3!>=QtK56|twG@yBt^!hnY1NkfEp8w_n z^3(XQb>0E;Pns3aodC37=Id9{7eM~ePgU#h+p9SoY4cn17NnjrIdLzLFBGJH^B$1@ zPSa-XY#?84|6lXtKz^L|u}PIceoEHms;xl&5-&vyHz5DmYQc+hfqWlL$A26^^Q-=* LM@|Lu(ftbm6ST6Y diff --git a/reference/ggv_bin-sample-v3.gpx b/reference/ggv_bin-sample-v3.gpx deleted file mode 100644 index d4b9b058b..000000000 --- a/reference/ggv_bin-sample-v3.gpx +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - Beispiel-Text - Beispiel-Text - Beispiel-Text - - - Linie - - - - - - - - - - - - - - - - - - - - Fläche - - - - - - - - - - - - - - diff --git a/reference/ggv_bin-sample-v3.ovl b/reference/ggv_bin-sample-v3.ovl deleted file mode 100644 index 60cf3f764a8bff0c77602b202415072476a9645f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4148 zcmeH~ZEO@(6o$_hyHxN46#}A8Yaj?~`4H4#P253gYXgXswxB4RTDI+Kq0P2I6m?fn zBMI6XaJ-r4rviBqTKm)ui0F>C7ls`5}(Fso$Ts4+Prk^vTo^oG7NA^b=%R99P7S`qY! zhfsi%CB0}DRo7HkgiC8GL$zgz{P2*-Aey_mpIwndWN4%WV-Akrdd9O>|p-y(DA-r;TsBUg)jXM#8d_*isdm1{6fmU_e2n*!?k_ z6(kc41{B1P1_KHbK!X7ViJ-xNg2d2ZKtY<&U_e1y(O^J96b%LxNJteCF`yusXfU84 zel!?RkN_GCC`bei1{5TQ1_KJxga!i&(uxKH3fx3JXiyL;p*r_RIZGxQ3@C^n4F(h> zfCd8!5jhXh_p~o3zf7mJ}uOP1_KJ>M}q+c382A% zf<(|@KtWa?kX%BVxBgElCL9}NZ+B!C733KBts0R@Sn z!GMA^p}~NHw4%X)I&Gy5x_2+|spFs=R>5BK^JaqqcN$}8FrXk!XfU84t!OZyPFrb% zh>t${=%bHb`sgPb3@C^n4ad)_tZ!^|zr$p3e<{Rifm0u!&gpMI$lBB4KC>qi*Sq){ z8XA&sO2`x+;lvgENix~zhLenO9nYWeb-0{Q=US(BjUB$uXuOeRi{I7ZOWf`nFYHS- zUc{GTyqGW9nCwgGhbt1!gfD&}c|N*yxn2J6V+1;fCeb{9T>cflq)OciJKs}RbzV(0 zF5ZuS%-8&rOx_Jr-Z~XJcSrzyfd!trx%}*GW0&&u4z*-?GB8 zf2})R^Tf6SJHFav zCtJeqzQ;-GboxqZ$?*NOZ;54p{M^pA=~P%2tR4Mi&gja#=E;8^Tx!{a*N@(Oh)0a7 zo?k^S`DJ+I=R+@Bc0tuEe}su|C-xA0Hz2(5j#n)E)V0fok0kyzF=yHz&)+p6<5kOE zzH@Q55GU*&C%zdKxPF;sm&?t2*CcHxhTYyA+`rti3qRSKk=-75Hgf~_%zUbTrDZR8 zI#lW<-b}1`dan1Dn`Uj>zS^<}9xEPj;$4Pf%T;dvYo3~&m;btD&pkM}S zC5vLOJ`AFUm_rXP8}ARd6+%KR_GZ(8=o!p+saiN8n8#@}2te$x&%Ba^+C@7_b6 z4~gd$=H@y(ot94A4RX5V{Hfvf^h#b; z8@o>DJ<67I_$+53!`x&@A7YtBzpo6?i_95c7e7x`9kX+I^0)^l5I@m)f7>?V?(9&( z$^J*C-AL~~3)L@kM*B`)#AY@}?|%Eh=?dbxvpDTp;`@GRXxT`- zquREkCF?&}YuWzy?-}$A@hBHIc>2hQvxDX>C%(UV$+YTrzq8HW{d4fZYcb3I?Lf_2 z&n4vvohbm%I6{)r5joBa4Cy>f&EI nXaDE!@S{t)=?eC!LxVdGpJ9i(^~@Ek@_5*B9DSs~?sEHISb2}4 diff --git a/reference/ggv_ovl.ovl b/reference/ggv_ovl.ovl deleted file mode 100644 index 06fc5cd64..000000000 --- a/reference/ggv_ovl.ovl +++ /dev/null @@ -1,261 +0,0 @@ -[Symbol 1] -Typ=3 -Group=1 -Col=3 -Zoom=1 -Size=102 -Art=1 -Punkte=37 -XKoord0=10.65544468 -YKoord0=51.76587580 -XKoord1=10.65218499 -YKoord1=51.76785421 -XKoord2=10.64862029 -YKoord2=51.77140983 -XKoord3=10.64497174 -YKoord3=51.77267441 -XKoord4=10.64177929 -YKoord4=51.77253927 -XKoord5=10.63658709 -YKoord5=51.77319595 -XKoord6=10.63379175 -YKoord6=51.77202137 -XKoord7=10.62861368 -YKoord7=51.77105955 -XKoord8=10.62724928 -YKoord8=51.77139306 -XKoord9=10.63186918 -YKoord9=51.77294694 -XKoord10=10.63254193 -YKoord10=51.77352186 -XKoord11=10.62848613 -YKoord11=51.77757803 -XKoord12=10.62817257 -YKoord12=51.77893066 -XKoord13=10.62717649 -YKoord13=51.77943882 -XKoord14=10.62589235 -YKoord14=51.77999590 -XKoord15=10.62677915 -YKoord15=51.78047801 -XKoord16=10.63320509 -YKoord16=51.77984957 -XKoord17=10.63871707 -YKoord17=51.77999757 -XKoord18=10.64266096 -YKoord18=51.77886389 -XKoord19=10.64411748 -YKoord19=51.77906825 -XKoord20=10.64505184 -YKoord20=51.78085288 -XKoord21=10.64760783 -YKoord21=51.78140135 -XKoord22=10.64750964 -YKoord22=51.78666102 -XKoord23=10.64666131 -YKoord23=51.78923465 -XKoord24=10.64432653 -YKoord24=51.79079540 -XKoord25=10.64342137 -YKoord25=51.78981930 -XKoord26=10.64058175 -YKoord26=51.78945448 -XKoord27=10.64087544 -YKoord27=51.78756280 -XKoord28=10.63828988 -YKoord28=51.78620563 -XKoord29=10.63477916 -YKoord29=51.78531071 -XKoord30=10.63145721 -YKoord30=51.78562653 -XKoord31=10.62874861 -YKoord31=51.78687753 -XKoord32=10.62751729 -YKoord32=51.78689459 -XKoord33=10.61656675 -YKoord33=51.79477582 -XKoord34=10.62139475 -YKoord34=51.79601267 -XKoord35=10.62075568 -YKoord35=51.79840345 -XKoord36=10.61712344 -YKoord36=51.80020623 -[Symbol 2] -Typ=5 -Group=1 -Width=40 -Height=40 -Dir=145 -Art=1 -Col=1 -Zoom=1 -Size=102 -Area=6 -XKoord=10.60357219 -YKoord=51.80439171 -[Symbol 3] -Typ=2 -Group=1 -Col=1 -Area=1 -Zoom=1 -Size=140 -Font=1 -Dir=100 -XKoord=10.61397192 -YKoord=51.80532805 -Text=Test Text -[Symbol 4] -Typ=3 -Group=1 -Col=1 -Zoom=1 -Size=102 -Art=1 -Punkte=12 -XKoord0=10.68674217 -YKoord0=51.74466700 -XKoord1=10.69060221 -YKoord1=51.74721824 -XKoord2=10.68813476 -YKoord2=51.74900651 -XKoord3=10.68544330 -YKoord3=51.75061815 -XKoord4=10.67975602 -YKoord4=51.75150857 -XKoord5=10.68459226 -YKoord5=51.75498985 -XKoord6=10.68366920 -YKoord6=51.75743002 -XKoord7=10.67707586 -YKoord7=51.76125458 -XKoord8=10.66885560 -YKoord8=51.76420301 -XKoord9=10.66582832 -YKoord9=51.76460551 -XKoord10=10.66341456 -YKoord10=51.76396555 -XKoord11=10.65859717 -YKoord11=51.76493250 -[Symbol 5] -Typ=3 -Group=9 -Col=1 -Zoom=1 -Size=104 -Art=1 -Punkte=15 -XKoord0=10.55206839 -YKoord0=51.78445444 -XKoord1=10.55532307 -YKoord1=51.78427659 -XKoord2=10.56091250 -YKoord2=51.78456204 -XKoord3=10.56554552 -YKoord3=51.78652284 -XKoord4=10.56815308 -YKoord4=51.78648808 -XKoord5=10.57172940 -YKoord5=51.78513698 -XKoord6=10.57786274 -YKoord6=51.78231334 -XKoord7=10.57811951 -YKoord7=51.78136609 -XKoord8=10.57780475 -YKoord8=51.78065123 -XKoord9=10.57627448 -YKoord9=51.78040211 -XKoord10=10.57496306 -YKoord10=51.78019497 -XKoord11=10.57412889 -YKoord11=51.77912753 -XKoord12=10.57307126 -YKoord12=51.77788331 -XKoord13=10.57426483 -YKoord13=51.77678870 -XKoord14=10.57768755 -YKoord14=51.77521476 -[Symbol 6] -Typ=4 -Group=9 -Art=1 -Col=1 -Area=5 -Zoom=1 -Size=102 -Punkte=5 -XKoord0=10.59652507 -YKoord0=51.80188093 -XKoord1=10.60803867 -YKoord1=51.79938689 -XKoord2=10.58909290 -YKoord2=51.79263370 -XKoord3=10.57832128 -YKoord3=51.80181232 -XKoord4=10.59314542 -YKoord4=51.80269083 -[Symbol 7] -Typ=3 -Group=17 -Col=2 -Zoom=1 -Size=105 -Art=3 -Punkte=4 -XKoord0=10.60657924 -YKoord0=51.76255405 -XKoord1=10.59852740 -YKoord1=51.76630420 -XKoord2=10.59033233 -YKoord2=51.76807826 -XKoord3=10.58660071 -YKoord3=51.77527456 -[Symbol 8] -Typ=4 -Group=17 -Art=1 -Col=1 -Area=7 -Zoom=1 -Size=102 -Punkte=5 -XKoord0=10.61041078 -YKoord0=51.76438920 -XKoord1=10.60638215 -YKoord1=51.75496141 -XKoord2=10.62417615 -YKoord2=51.75237979 -XKoord3=10.62512771 -YKoord3=51.76274845 -XKoord4=10.61706616 -YKoord4=51.76618541 -[Symbol 9] -Typ=4 -Group=1 -Art=1 -Col=1 -Area=4 -Zoom=1 -Size=102 -Punkte=6 -XKoord0=10.63694247 -YKoord0=51.81103276 -XKoord1=10.62712184 -YKoord1=51.80006827 -XKoord2=10.64282436 -YKoord2=51.79333319 -XKoord3=10.66695026 -YKoord3=51.80094843 -XKoord4=10.64989768 -YKoord4=51.81237972 -XKoord5=10.63068244 -YKoord5=51.81637803 -[Overlay] -Symbols=9 -[MapLage] -MapName=Top. Karte 1:50.000 Nieders. -DimmFc=100 -ZoomFc=141 -CenterLat=51.79222626 -CenterLong=10.62546251 -RefOn=0 diff --git a/reference/ggv_ovl~ovl.gpx b/reference/ggv_ovl~ovl.gpx deleted file mode 100644 index ad486408b..000000000 --- a/reference/ggv_ovl~ovl.gpx +++ /dev/null @@ -1,174 +0,0 @@ - - - - - - Route 1 - - RPT001 - - - RPT002 - - - RPT003 - - - RPT004 - - - RPT005 - - - RPT006 - - - RPT007 - - - RPT008 - - - RPT009 - - - RPT010 - - - RPT011 - - - RPT012 - - - RPT013 - - - RPT014 - - - RPT015 - - - - Route 2 - - RPT016 - - - RPT017 - - - RPT018 - - - RPT019 - - - RPT020 - - - - Route 3 - - RPT021 - - - RPT022 - - - RPT023 - - - RPT024 - - - - Route 4 - - RPT025 - - - RPT026 - - - RPT027 - - - RPT028 - - - RPT029 - - - - Track 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Track 2 - - - - - - - - - - - - - - - - - Track 3 - - - - - - - - - - diff --git a/testo.d/ggv_bin.test b/testo.d/ggv_bin.test deleted file mode 100644 index 2f672477a..000000000 --- a/testo.d/ggv_bin.test +++ /dev/null @@ -1,8 +0,0 @@ -# -# Geogrid-Viewer binary overlay files -# -rm -f ${TMPDIR}/ggv_bin* -gpsbabel -i ggv_bin -f ${REFERENCE}/ggv_bin-sample-v2.ovl -o gpx -F ${TMPDIR}/ggv_bin-sample-v2.gpx -compare ${REFERENCE}/ggv_bin-sample-v2.gpx ${TMPDIR}/ggv_bin-sample-v2.gpx -gpsbabel -i ggv_bin -f ${REFERENCE}/ggv_bin-sample-v3.ovl -o gpx -F ${TMPDIR}/ggv_bin-sample-v3.gpx -compare ${REFERENCE}/ggv_bin-sample-v3.gpx ${TMPDIR}/ggv_bin-sample-v3.gpx diff --git a/testo.d/ggv_ovl.test b/testo.d/ggv_ovl.test deleted file mode 100644 index 394abcb9b..000000000 --- a/testo.d/ggv_ovl.test +++ /dev/null @@ -1,7 +0,0 @@ - -# -# ggv_ovl 'Geogrid Viewer ascii overlay files' -# -gpsbabel -i ggv_ovl -f ${REFERENCE}/ggv_ovl.ovl -o gpx -F ${TMPDIR}/ggv_ovl~ovl.gpx -compare ${REFERENCE}/ggv_ovl~ovl.gpx ${TMPDIR}/ggv_ovl~ovl.gpx - diff --git a/vecs.cc b/vecs.cc index 9a1eeaca1..b6fe13406 100644 --- a/vecs.cc +++ b/vecs.cc @@ -48,7 +48,6 @@ #include "gbversion.h" // for WEB_DOC_DIR #include "gdb.h" // for GdbFormat #include "geojson.h" // for GeoJsonFormat -#include "ggv_bin.h" // for GgvBinFormat #include "globalsat_sport.h" // for GlobalsatSportFormat #include "gpx.h" // for GpxFormat #include "gtrnctr.h" // for GtrnctrFormat @@ -124,7 +123,6 @@ extern ff_vecs_t destinator_trl_vecs; extern ff_vecs_t igo8_vecs; extern ff_vecs_t mapasia_tr7_vecs; extern ff_vecs_t navitel_trk_vecs; -extern ff_vecs_t ggv_ovl_vecs; extern ff_vecs_t itracku_vecs; extern ff_vecs_t itracku_fvecs; extern ff_vecs_t sbp_vecs; @@ -219,7 +217,6 @@ struct Vecs::Impl HumminbirdHTFormat humminbird_ht_fmt; LegacyFormat mapasia_tr7_fmt {mapasia_tr7_vecs}; LegacyFormat navitel_trk_fmt {navitel_trk_vecs}; - LegacyFormat ggv_ovl_fmt {ggv_ovl_vecs}; LegacyFormat itracku_fmt {itracku_vecs}; LegacyFormat itracku_ffmt {itracku_fvecs}; LegacyFormat sbp_fmt {sbp_vecs}; @@ -241,7 +238,6 @@ struct Vecs::Impl EnergymproFormat energympro_fmt; MyNavFormat mynav_fmt; GeoJsonFormat geojson_fmt; - GgvBinFormat ggv_bin_fmt; GlobalsatSportFormat globalsat_sport_fmt; QstarzBL1000Format qstarz_bl_1000_fmt; #endif // MAXIMAL_ENABLED diff --git a/xmldoc/formats/ggv_bin.xml b/xmldoc/formats/ggv_bin.xml deleted file mode 100644 index 4d83aab58..000000000 --- a/xmldoc/formats/ggv_bin.xml +++ /dev/null @@ -1,22 +0,0 @@ - - Binary overlay files (.ovl) used by - Geogrid-Viewer. - - - Geogrid-Viewer is part of several - Top50 - map products available in Germany and Austria. - - - This module supports binary overlay file format version 2.0, 3.0 - and 4.0. Those files can be identified by looking at the first - bytes: - - -hexdump -C example.ovl | head -n 2 -00000000 44 4f 4d 47 56 43 52 44 20 4f 76 6c 66 69 6c 65 |DOMGVCRD Ovlfile| -00000010 20 56 33 2e 30 3a 00 00 00 08 00 00 00 1e 00 00 | V3.0:..........| - - - The current file version 5.0 is not supported. - diff --git a/xmldoc/formats/ggv_ovl.xml b/xmldoc/formats/ggv_ovl.xml deleted file mode 100644 index 6e2078a39..000000000 --- a/xmldoc/formats/ggv_ovl.xml +++ /dev/null @@ -1,36 +0,0 @@ - - Overlay files used by Geogrid-Viewer has to be in ASCII format. - Make sure you save the files correctly. - - - Lines or polygons within the Geogrid-Viewer (type 3 and 4) will be - converted to tracks, except they are grouped. In this case GPSBabel creates routes. - - - During the creation of an overlay file, a circle will be added to each - position of a waypoint or a route. - - - - Sample layout of the ASCII overlay file - - [Symbol <number # >] - Typ=<1=picture,2=Text, 3=line, 4=area, 5=rectangle, 6=circle, 7=triangle> - Group=<1=no group, number > 1=group number> - Col=<number of the line color> - Zoom=<1=no zoom, 2=zoom> - Size=<size can be between 101 and 118> - Art=<style> - Punkte=<number of XKoord> - XKoord0=<decimal X coordinate (Longitude) of the waypoint> - YKoord0=<decimal Y coordinate (Latitude) of the waypoint> - [MapLage] - MapName=Top. Karte 1:50.000 Nieders. - DimmFc=100 - ZoomFc=<zoom level of the map> - CenterLat=<map center in decimal Y coordinates> - CenterLong=<map center in decimal X coordinates of > - RefOn=0 - - - -- 2.30.2